bitkeeper revision 1.7.1.7 (3df0b21aFrBUXjYnKdTMgt_D5mJJbg)
authorakw27@labyrinth.cl.cam.ac.uk <akw27@labyrinth.cl.cam.ac.uk>
Fri, 6 Dec 2002 14:20:10 +0000 (14:20 +0000)
committerakw27@labyrinth.cl.cam.ac.uk <akw27@labyrinth.cl.cam.ac.uk>
Fri, 6 Dec 2002 14:20:10 +0000 (14:20 +0000)
commit5a4d8dc794608778815046c0846c0cc23e1c66f3
tree3af4bc25b353cddae38042556ca46f548d130f63
parent898bb9837e46faf85ee4ff4f6cd0c18379849824
parentea17a57b54fdd7908919e2322631d400c9bf030d
bitkeeper revision 1.7.1.7 (3df0b21aFrBUXjYnKdTMgt_D5mJJbg)

conflict resolutions
.rootkeys
BitKeeper/etc/logging_ok
xen-2.4.16/common/domain.c
xen-2.4.16/common/kernel.c
xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h